From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 25 Jun 2011 18:31:36 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~32
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=19f23648bff0e698c45c0fb2f15de4e038794cfe;p=emacs.git

Merge from trunk.
---

19f23648bff0e698c45c0fb2f15de4e038794cfe
diff --cc src/ChangeLog
index 0651e51ffb3,c00910c38fe..cb287ca88c8
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Use gnulib's dup2 module instead of rolling our own.
 +	* sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.
 +
+ 2011-06-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+ 	* dispnew.c (scrolling_window): Before scrolling, turn off a
+ 	mouse-highlight in the window being scrolled.
+ 
  2011-06-24  Juanma Barranquero  <lekktu@gmail.com>
  
  	Move DEFSYM to lisp.h and use everywhere.